cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Altered old_way stuff to be Railsy like old_node is now

Browse source
This commit is contained in:
Matt Amos 2012-03-28 18:01:21 +01:00 • committed by Tom Hughes
parent 72e59b49fa
commit 990f3eba40
7 changed files with 80 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/old_node_controller.rb
View file

@ -31,7 +31,7 @@ class OldNodeController < ApplicationController
end
def version
if @old_node.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
if @old_node.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
render :nothing => true, :status => :forbidden
else

61
app/controllers/old_way_controller.rb
View file

@ -2,57 +2,74 @@ class OldWayController < 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 ]
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])
# TODO - maybe a bit heavyweight to do this on every
# call, perhaps try lazy auth.
setup_user_auth
way = Way.find(params[:id].to_i)
doc = OSM::API.new.get_xml_doc
way.old_ways.each do |old_way|
unless old_way.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
doc.root << old_way.to_xml_node
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 = OldWay.where(:way_id => params[:id], :version => params[:version]).first
# TODO - maybe a bit heavyweight to do this on every
# call, perhaps try lazy auth.
setup_user_auth
if old_way.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
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
response.last_modified = @old_way.timestamp
doc = OSM::API.new.get_xml_doc
doc.root << old_way.to_xml_node
doc.root << @old_way.to_xml_node
render :text => doc.to_s, :content_type => "text/xml"
end
else
render :nothing => true, :status => :not_found
end
end
def redact
if @user && @user.moderator?
render :nothing => true
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
render :nothing => true, :status => :forbidden
# 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
def lookup_old_way
@old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
if @old_way.nil?
render :nothing => true, :status => :not_found
return false
end
end
end

5
app/models/old_way.rb
View file

@ -1,10 +1,13 @@
class OldWay < ActiveRecord::Base
include ConsistencyValidations
include Redactable
self.table_name = "ways"
self.primary_keys = "way_id", "version"
# note this needs to be included after the table name changes, or
# the queries generated by Redactable will use the wrong table name.
include Redactable
belongs_to :changeset
belongs_to :redaction
belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"

2
config/routes.rb
View file

@ -27,8 +27,8 @@ OpenStreetMap::Application.routes.draw do
match 'api/0.6/way/:id/history' => 'old_way#history', :via => :get, :id => /\d+/
match 'api/0.6/way/:id/full' => 'way#full', :via => :get, :id => /\d+/
match 'api/0.6/way/:id/relations' => 'relation#relations_for_way', :via => :get, :id => /\d+/
match 'api/0.6/way/:id/:version/redact' => 'old_way#redact', :via => :post, :version => /\d+/, :id => /\d+/
match 'api/0.6/way/:id/:version' => 'old_way#version', :via => :get, :id => /\d+/, :version => /\d+/
match 'api/0.6/way/:id/:version/redact' => 'old_way#redact', :via => :put, :version => /\d+/, :id => /\d+/
match 'api/0.6/way/:id' => 'way#read', :via => :get, :id => /\d+/
match 'api/0.6/way/:id' => 'way#update', :via => :put, :id => /\d+/
match 'api/0.6/way/:id' => 'way#delete', :via => :delete, :id => /\d+/

2
test/fixtures/ways.yml vendored
View file

@ -33,7 +33,7 @@ way_with_versions_v2:
visible: true
version: 2
way_with_versions:
way_with_versions_v3:
way_id: 4
changeset_id: 4
timestamp: 2008-01-01 00:03:00

14
test/functional/old_node_controller_test.rb
View file

@ -222,7 +222,6 @@ class OldNodeControllerTest < ActionController::TestCase
# not even to a logged-in user
basic_authorization(users(:public_user).email, "test")
get :version, :id => node.node_id, :version => node.version
get :history, :id => node.node_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history, even when logged in."
@ -238,14 +237,20 @@ class OldNodeControllerTest < ActionController::TestCase
do_redact_node(node, redactions(:example))
assert_response :success, "should be OK to redact old version as moderator."
# check moderator can still see the redacted data
# check moderator can still see the redacted data, when passing
# the appropriate flag
get :version, :id => node.node_id, :version => node.version
assert_response :success, "After redaction, node should not be gone for moderator."
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
get :version, :id => node.node_id, :version => node.version, :show_redactions => 'true'
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get :history, :id => node.node_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators."
assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "node #{node.node_id} version #{node.version} should not be present in the history for moderators when not passing flag."
get :history, :id => node.node_id, :show_redactions => 'true'
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 1, "node #{node.node_id} version #{node.version} should still be present in the history for moderators when passing flag."
end
# testing that if the moderator drops auth, he can't see the
@ -265,7 +270,6 @@ class OldNodeControllerTest < ActionController::TestCase
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
get :version, :id => node.node_id, :version => node.version
get :history, :id => node.node_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm node[id=#{node.node_id}][version=#{node.version}]", 0, "redacted node #{node.node_id} version #{node.version} shouldn't be present in the history."

25
test/functional/old_way_controller_test.rb
View file

@ -60,7 +60,7 @@ class OldWayControllerTest < ActionController::TestCase
# test the redaction of an old version of a way, while not being
# authorised.
def test_redact_way_unauthorised
do_redact_way(ways(:way_with_versions),
do_redact_way(ways(:way_with_versions_v3),
redactions(:example))
assert_response :unauthorized, "should need to be authenticated to redact."
end
@ -71,7 +71,7 @@ class OldWayControllerTest < ActionController::TestCase
def test_redact_way_normal_user
basic_authorization(users(:public_user).email, "test")
do_redact_way(ways(:way_with_versions),
do_redact_way(ways(:way_with_versions_v3),
redactions(:example))
assert_response :forbidden, "should need to be moderator to redact."
end
@ -84,7 +84,7 @@ class OldWayControllerTest < ActionController::TestCase
do_redact_way(ways(:way_with_versions_v4),
redactions(:example))
assert_response :forbidden, "shouldn't be OK to redact current version as moderator."
assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
end
##
@ -123,26 +123,32 @@ class OldWayControllerTest < ActionController::TestCase
# test the redaction of an old version of a way, while being
# authorised as a moderator.
def test_redact_way_moderator
way = ways(:way_with_versions)
way = ways(:way_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test")
do_redact_way(way, redactions(:example))
assert_response :success, "should be OK to redact old version as moderator."
# check moderator can still see the redacted data
# check moderator can still see the redacted data, when passing
# the appropriate flag
get :version, :id => way.way_id, :version => way.version
assert_response :success, "After redaction, node should not be gone for moderator."
assert_response :forbidden, "After redaction, node should be gone for moderator, when flag not passed."
get :version, :id => way.way_id, :version => way.version, :show_redactions => 'true'
assert_response :success, "After redaction, node should not be gone for moderator, when flag passed."
# and when accessed via history
get :history, :id => way.way_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 1, "way #{way.way_id} version #{way.version} should still be present in the history for moderators."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "way #{way.way_id} version #{way.version} should not be present in the history for moderators when not passing flag."
get :history, :id => way.way_id, :show_redactions => 'true'
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 1, "way #{way.way_id} version #{way.version} should still be present in the history for moderators when passing flag."
end
# testing that if the moderator drops auth, he can't see the
# redacted stuff any more.
def test_redact_way_is_redacted
way = ways(:way_with_versions)
way = ways(:way_with_versions_v3)
basic_authorization(users(:moderator_user).email, "test")
do_redact_way(way, redactions(:example))
@ -156,8 +162,7 @@ class OldWayControllerTest < ActionController::TestCase
assert_response :forbidden, "Redacted node shouldn't be visible via the version API."
# and when accessed via history
get :version, :id => way.node_id, :version => way.version
get :history, :id => way.node_id
get :history, :id => way.way_id
assert_response :success, "Redaction shouldn't have stopped history working."
assert_select "osm way[id=#{way.way_id}][version=#{way.version}]", 0, "redacted way #{way.way_id} version #{way.version} shouldn't be present in the history."
end