Refactored common functionality from object history controllers
This commit is contained in:
Matt Amos
Tom Hughes
parent
1f9301e2e2
commit
7953a883d0
4 changed files with 97 additions and 213 deletions
73
app/controllers/old_controller.rb
Normal file
73
app/controllers/old_controller.rb
Normal file
|
|
@ -0,0 +1,73 @@
|
||||||
|
# this class pulls together the logic for all the old_* controllers
|
||||||
|
# into one place. as it turns out, the API methods for historical
|
||||||
|
# nodes, ways and relations are basically identical.
|
||||||
|
class OldController < ApplicationController
|
||||||
|
require 'xml/libxml'
|
||||||
|
|
||||||
|
skip_before_filter :verify_authenticity_token
|
||||||
|
before_filter :setup_user_auth, :only => [ :history, :version ]
|
||||||
|
before_filter :authorize, :only => [ :redact ]
|
||||||
|
before_filter :authorize_moderator, :only => [ :redact ]
|
||||||
|
before_filter :require_allow_write_api, :only => [ :redact ]
|
||||||
|
before_filter :check_api_readable
|
||||||
|
before_filter :check_api_writable, :only => [ :redact ]
|
||||||
|
after_filter :compress_output
|
||||||
|
around_filter :api_call_handle_error, :api_call_timeout
|
||||||
|
before_filter :lookup_old_element, :except => [ :history ]
|
||||||
|
before_filter :lookup_old_elements_via_current, :only => [ :history ]
|
||||||
|
|
||||||
|
def history
|
||||||
|
doc = OSM::API.new.get_xml_doc
|
||||||
|
|
||||||
|
visible_elements = if show_redactions?
|
||||||
|
@elements
|
||||||
|
else
|
||||||
|
@elements.unredacted
|
||||||
|
end
|
||||||
|
|
||||||
|
visible_elements.each do |element|
|
||||||
|
doc.root << element.to_xml_node
|
||||||
|
end
|
||||||
|
|
||||||
|
render :text => doc.to_s, :content_type => "text/xml"
|
||||||
|
end
|
||||||
|
|
||||||
|
def version
|
||||||
|
if @old_element.redacted? and not show_redactions?
|
||||||
|
render :nothing => true, :status => :forbidden
|
||||||
|
|
||||||
|
else
|
||||||
|
response.last_modified = @old_element.timestamp
|
||||||
|
|
||||||
|
doc = OSM::API.new.get_xml_doc
|
||||||
|
doc.root << @old_element.to_xml_node
|
||||||
|
|
||||||
|
render :text => doc.to_s, :content_type => "text/xml"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def redact
|
||||||
|
redaction_id = params['redaction']
|
||||||
|
unless redaction_id.nil?
|
||||||
|
# if a redaction ID was specified, then set this element to
|
||||||
|
# be redacted in that redaction. (TODO: check that the
|
||||||
|
# user doing the redaction owns the redaction object too)
|
||||||
|
redaction = Redaction.find(redaction_id.to_i)
|
||||||
|
@old_element.redact!(redaction)
|
||||||
|
|
||||||
|
else
|
||||||
|
# if no redaction ID was provided, then this is an unredact
|
||||||
|
# operation.
|
||||||
|
@old_element.redact!(nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
# just return an empty 200 OK for success
|
||||||
|
render :nothing => true
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def show_redactions?
|
||||||
|
@user and @user.moderator? and params[:show_redactions] == "true"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -1,78 +1,13 @@
|
||||||
class OldNodeController < ApplicationController
|
class OldNodeController < OldController
|
||||||
require 'xml/libxml'
|
|
||||||
|
|
||||||
skip_before_filter :verify_authenticity_token
|
|
||||||
before_filter :setup_user_auth, :only => [ :history, :version ]
|
|
||||||
before_filter :authorize, :only => [ :redact ]
|
|
||||||
before_filter :authorize_moderator, :only => [ :redact ]
|
|
||||||
before_filter :require_allow_write_api, :only => [ :redact ]
|
|
||||||
before_filter :check_api_readable
|
|
||||||
before_filter :check_api_writable, :only => [ :redact ]
|
|
||||||
before_filter :lookup_old_node, :except => [ :history ]
|
|
||||||
after_filter :compress_output
|
|
||||||
around_filter :api_call_handle_error, :api_call_timeout
|
|
||||||
|
|
||||||
def history
|
|
||||||
node = Node.find(params[:id].to_i)
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
|
|
||||||
visible_nodes = if @user and @user.moderator? and params[:show_redactions] == "true"
|
|
||||||
node.old_nodes
|
|
||||||
else
|
|
||||||
node.old_nodes.unredacted
|
|
||||||
end
|
|
||||||
|
|
||||||
visible_nodes.each do |old_node|
|
|
||||||
doc.root << old_node.to_xml_node
|
|
||||||
end
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
|
|
||||||
def version
|
|
||||||
if @old_node.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
|
|
||||||
render :nothing => true, :status => :forbidden
|
|
||||||
|
|
||||||
else
|
|
||||||
response.last_modified = @old_node.timestamp
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
doc.root << @old_node.to_xml_node
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def redact
|
|
||||||
redaction_id = params['redaction']
|
|
||||||
unless redaction_id.nil?
|
|
||||||
# if a redaction ID was specified, then set this node to
|
|
||||||
# be redacted in that redaction. (TODO: check that the
|
|
||||||
# user doing the redaction owns the redaction object too)
|
|
||||||
redaction = Redaction.find(redaction_id.to_i)
|
|
||||||
@old_node.redact!(redaction)
|
|
||||||
|
|
||||||
else
|
|
||||||
# if no redaction ID was provided, then this is an unredact
|
|
||||||
# operation.
|
|
||||||
@old_node.redact!(nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
# just return an empty 200 OK for success
|
|
||||||
render :nothing => true
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def lookup_old_node
|
def lookup_old_element
|
||||||
@old_node = OldNode.where(:node_id => params[:id], :version => params[:version]).first
|
@old_element = OldNode.find([params[:id], params[:version]])
|
||||||
if @old_node.nil?
|
end
|
||||||
# i want to do this
|
|
||||||
#raise OSM::APINotFoundError.new
|
def lookup_old_elements_via_current
|
||||||
# but i get errors, so i'm getting very fed up and doing this instead
|
node = Node.find(params[:id])
|
||||||
render :nothing => true, :status => :not_found
|
@elements = node.old_nodes
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,75 +1,13 @@
|
||||||
class OldRelationController < ApplicationController
|
class OldRelationController < OldController
|
||||||
require 'xml/libxml'
|
|
||||||
|
|
||||||
skip_before_filter :verify_authenticity_token
|
|
||||||
before_filter :setup_user_auth, :only => [ :history, :version ]
|
|
||||||
before_filter :authorize, :only => [ :redact ]
|
|
||||||
before_filter :authorize_moderator, :only => [ :redact ]
|
|
||||||
before_filter :require_allow_write_api, :only => [ :redact ]
|
|
||||||
before_filter :check_api_readable
|
|
||||||
before_filter :check_api_writable, :only => [ :redact ]
|
|
||||||
before_filter :lookup_old_relation, :except => [ :history ]
|
|
||||||
after_filter :compress_output
|
|
||||||
around_filter :api_call_handle_error, :api_call_timeout
|
|
||||||
|
|
||||||
def history
|
|
||||||
relation = Relation.find(params[:id].to_i)
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
|
|
||||||
visible_relations = if @user and @user.moderator? and params[:show_redactions] == "true"
|
|
||||||
relation.old_relations
|
|
||||||
else
|
|
||||||
relation.old_relations.unredacted
|
|
||||||
end
|
|
||||||
|
|
||||||
visible_relations.each do |old_relation|
|
|
||||||
doc.root << old_relation.to_xml_node
|
|
||||||
end
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
|
|
||||||
def version
|
|
||||||
if @old_relation.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
|
|
||||||
render :nothing => true, :status => :forbidden
|
|
||||||
else
|
|
||||||
|
|
||||||
response.last_modified = @old_relation.timestamp
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
doc.root << @old_relation.to_xml_node
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def redact
|
|
||||||
redaction_id = params['redaction']
|
|
||||||
unless redaction_id.nil?
|
|
||||||
# if a redaction ID was specified, then set this relation to
|
|
||||||
# be redacted in that redaction. (TODO: check that the
|
|
||||||
# user doing the redaction owns the redaction object too)
|
|
||||||
redaction = Redaction.find(redaction_id.to_i)
|
|
||||||
@old_relation.redact!(redaction)
|
|
||||||
|
|
||||||
else
|
|
||||||
# if no redaction ID was provided, then this is an unredact
|
|
||||||
# operation.
|
|
||||||
@old_relation.redact!(nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
# just return an empty 200 OK for success
|
|
||||||
render :nothing => true
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def lookup_old_relation
|
def lookup_old_element
|
||||||
@old_relation = OldRelation.where(:relation_id => params[:id], :version => params[:version]).first
|
@old_element = OldRelation.find([params[:id], params[:version]])
|
||||||
if @old_relation.nil?
|
end
|
||||||
render :nothing => true, :status => :not_found
|
|
||||||
return false
|
def lookup_old_elements_via_current
|
||||||
end
|
relation = Relation.find(params[:id])
|
||||||
|
@elements = relation.old_relations
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,75 +1,13 @@
|
||||||
class OldWayController < ApplicationController
|
class OldWayController < OldController
|
||||||
require 'xml/libxml'
|
|
||||||
|
|
||||||
skip_before_filter :verify_authenticity_token
|
|
||||||
before_filter :setup_user_auth, :only => [ :history, :version ]
|
|
||||||
before_filter :authorize, :only => [ :redact ]
|
|
||||||
before_filter :authorize_moderator, :only => [ :redact ]
|
|
||||||
before_filter :require_allow_write_api, :only => [ :redact ]
|
|
||||||
before_filter :check_api_readable
|
|
||||||
before_filter :check_api_writable, :only => [ :redact ]
|
|
||||||
before_filter :lookup_old_way, :except => [ :history ]
|
|
||||||
after_filter :compress_output
|
|
||||||
around_filter :api_call_handle_error, :api_call_timeout
|
|
||||||
|
|
||||||
def history
|
|
||||||
way = Way.find(params[:id].to_i)
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
|
|
||||||
visible_ways = if @user and @user.moderator? and params[:show_redactions] == "true"
|
|
||||||
way.old_ways
|
|
||||||
else
|
|
||||||
way.old_ways.unredacted
|
|
||||||
end
|
|
||||||
|
|
||||||
visible_ways.each do |old_way|
|
|
||||||
doc.root << old_way.to_xml_node
|
|
||||||
end
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
|
|
||||||
def version
|
|
||||||
if @old_way.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
|
|
||||||
render :nothing => true, :status => :forbidden
|
|
||||||
else
|
|
||||||
|
|
||||||
response.last_modified = @old_way.timestamp
|
|
||||||
|
|
||||||
doc = OSM::API.new.get_xml_doc
|
|
||||||
doc.root << @old_way.to_xml_node
|
|
||||||
|
|
||||||
render :text => doc.to_s, :content_type => "text/xml"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def redact
|
|
||||||
redaction_id = params['redaction']
|
|
||||||
unless redaction_id.nil?
|
|
||||||
# if a redaction ID was specified, then set this way to
|
|
||||||
# be redacted in that redaction. (TODO: check that the
|
|
||||||
# user doing the redaction owns the redaction object too)
|
|
||||||
redaction = Redaction.find(redaction_id.to_i)
|
|
||||||
@old_way.redact!(redaction)
|
|
||||||
|
|
||||||
else
|
|
||||||
# if no redaction ID was provided, then this is an unredact
|
|
||||||
# operation.
|
|
||||||
@old_way.redact!(nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
# just return an empty 200 OK for success
|
|
||||||
render :nothing => true
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def lookup_old_way
|
def lookup_old_element
|
||||||
@old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
|
@old_element = OldWay.find([params[:id], params[:version]])
|
||||||
if @old_way.nil?
|
end
|
||||||
render :nothing => true, :status => :not_found
|
|
||||||
return false
|
def lookup_old_elements_via_current
|
||||||
end
|
way = Way.find(params[:id])
|
||||||
|
@elements = way.old_ways
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue