From cbf6b394644e5eff071ecab3cae3f17842fd3631 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sun, 3 Mar 2024 12:12:25 +0300 Subject: [PATCH] Rename api element version action to show --- app/abilities/api_ability.rb | 4 +--- app/controllers/api/old_controller.rb | 4 ++-- .../old_nodes/{version.json.jbuilder => show.json.jbuilder} | 0 .../api/old_nodes/{version.xml.builder => show.xml.builder} | 0 .../{version.json.jbuilder => show.json.jbuilder} | 0 .../old_relations/{version.xml.builder => show.xml.builder} | 0 .../old_ways/{version.json.jbuilder => show.json.jbuilder} | 0 .../api/old_ways/{version.xml.builder => show.xml.builder} | 0 app/views/browse/_version_actions.erb | 2 +- config/routes.rb | 6 +++--- test/controllers/api/old_nodes_controller_test.rb | 4 ++-- test/controllers/api/old_relations_controller_test.rb | 4 ++-- test/controllers/api/old_ways_controller_test.rb | 4 ++-- 13 files changed, 13 insertions(+), 15 deletions(-) rename app/views/api/old_nodes/{version.json.jbuilder => show.json.jbuilder} (100%) rename app/views/api/old_nodes/{version.xml.builder => show.xml.builder} (100%) rename app/views/api/old_relations/{version.json.jbuilder => show.json.jbuilder} (100%) rename app/views/api/old_relations/{version.xml.builder => show.xml.builder} (100%) rename app/views/api/old_ways/{version.json.jbuilder => show.json.jbuilder} (100%) rename app/views/api/old_ways/{version.xml.builder => show.xml.builder} (100%) diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb index 0eae46f82..8ee280b3a 100644 --- a/app/abilities/api_ability.rb +++ b/app/abilities/api_ability.rb @@ -17,9 +17,7 @@ class ApiAbility can [:index, :show], Node can [:index, :show, :full, :ways_for_node], Way can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation - can [:history, :version], OldNode - can [:history, :version], OldWay - can [:history, :version], OldRelation + can [:history, :show], [OldNode, OldWay, OldRelation] can [:show], UserBlock if user&.active? diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb index ceed10978..7c9c32e63 100644 --- a/app/controllers/api/old_controller.rb +++ b/app/controllers/api/old_controller.rb @@ -7,7 +7,7 @@ module Api before_action :check_api_readable before_action :check_api_writable, :only => [:redact] - before_action :setup_user_auth, :only => [:history, :version] + before_action :setup_user_auth, :only => [:history, :show] before_action :authorize, :only => [:redact] authorize_resource @@ -38,7 +38,7 @@ module Api end end - def version + def show if @old_element.redacted? && !show_redactions? head :forbidden diff --git a/app/views/api/old_nodes/version.json.jbuilder b/app/views/api/old_nodes/show.json.jbuilder similarity index 100% rename from app/views/api/old_nodes/version.json.jbuilder rename to app/views/api/old_nodes/show.json.jbuilder diff --git a/app/views/api/old_nodes/version.xml.builder b/app/views/api/old_nodes/show.xml.builder similarity index 100% rename from app/views/api/old_nodes/version.xml.builder rename to app/views/api/old_nodes/show.xml.builder diff --git a/app/views/api/old_relations/version.json.jbuilder b/app/views/api/old_relations/show.json.jbuilder similarity index 100% rename from app/views/api/old_relations/version.json.jbuilder rename to app/views/api/old_relations/show.json.jbuilder diff --git a/app/views/api/old_relations/version.xml.builder b/app/views/api/old_relations/show.xml.builder similarity index 100% rename from app/views/api/old_relations/version.xml.builder rename to app/views/api/old_relations/show.xml.builder diff --git a/app/views/api/old_ways/version.json.jbuilder b/app/views/api/old_ways/show.json.jbuilder similarity index 100% rename from app/views/api/old_ways/version.json.jbuilder rename to app/views/api/old_ways/show.json.jbuilder diff --git a/app/views/api/old_ways/version.xml.builder b/app/views/api/old_ways/show.xml.builder similarity index 100% rename from app/views/api/old_ways/version.xml.builder rename to app/views/api/old_ways/show.xml.builder diff --git a/app/views/browse/_version_actions.erb b/app/views/browse/_version_actions.erb index 46bfd0dc2..3d4e4be13 100644 --- a/app/views/browse/_version_actions.erb +++ b/app/views/browse/_version_actions.erb @@ -2,7 +2,7 @@ <%= link_to t("browse.view_details"), :controller => :browse, :action => @type %> <% if !@feature.redacted? %> · - <%= link_to t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => :version %> + <%= link_to t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => :show %> <% elsif current_user&.moderator? %> · <% if !params[:show_redactions] %> diff --git a/config/routes.rb b/config/routes.rb index 98184e0e1..eee349855 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,7 +35,7 @@ OpenStreetMap::Application.routes.draw do get "node/:id/relations" => "api/relations#relations_for_node", :as => :node_relations, :id => /\d+/ get "node/:id/history" => "api/old_nodes#history", :as => :api_node_history, :id => /\d+/ post "node/:id/:version/redact" => "api/old_nodes#redact", :as => :node_version_redact, :version => /\d+/, :id => /\d+/ - get "node/:id/:version" => "api/old_nodes#version", :as => :node_version, :id => /\d+/, :version => /\d+/ + get "node/:id/:version" => "api/old_nodes#show", :as => :node_version, :id => /\d+/, :version => /\d+/ get "node/:id" => "api/nodes#show", :as => :api_node, :id => /\d+/ put "node/:id" => "api/nodes#update", :id => /\d+/ delete "node/:id" => "api/nodes#delete", :id => /\d+/ @@ -46,7 +46,7 @@ OpenStreetMap::Application.routes.draw do get "way/:id/full" => "api/ways#full", :as => :way_full, :id => /\d+/ get "way/:id/relations" => "api/relations#relations_for_way", :as => :way_relations, :id => /\d+/ post "way/:id/:version/redact" => "api/old_ways#redact", :as => :way_version_redact, :version => /\d+/, :id => /\d+/ - get "way/:id/:version" => "api/old_ways#version", :as => :way_version, :id => /\d+/, :version => /\d+/ + get "way/:id/:version" => "api/old_ways#show", :as => :way_version, :id => /\d+/, :version => /\d+/ get "way/:id" => "api/ways#show", :as => :api_way, :id => /\d+/ put "way/:id" => "api/ways#update", :id => /\d+/ delete "way/:id" => "api/ways#delete", :id => /\d+/ @@ -57,7 +57,7 @@ OpenStreetMap::Application.routes.draw do get "relation/:id/history" => "api/old_relations#history", :as => :api_relation_history, :id => /\d+/ get "relation/:id/full" => "api/relations#full", :as => :relation_full, :id => /\d+/ post "relation/:id/:version/redact" => "api/old_relations#redact", :as => :relation_version_redact, :version => /\d+/, :id => /\d+/ - get "relation/:id/:version" => "api/old_relations#version", :as => :relation_version, :id => /\d+/, :version => /\d+/ + get "relation/:id/:version" => "api/old_relations#show", :as => :relation_version, :id => /\d+/, :version => /\d+/ get "relation/:id" => "api/relations#show", :as => :api_relation, :id => /\d+/ put "relation/:id" => "api/relations#update", :id => /\d+/ delete "relation/:id" => "api/relations#delete", :id => /\d+/ diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 737f11c73..da5466748 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -15,7 +15,7 @@ module Api ) assert_routing( { :path => "/api/0.6/node/1/2", :method => :get }, - { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2" } + { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2" } ) assert_routing( { :path => "/api/0.6/node/1/history.json", :method => :get }, @@ -23,7 +23,7 @@ module Api ) assert_routing( { :path => "/api/0.6/node/1/2.json", :method => :get }, - { :controller => "api/old_nodes", :action => "version", :id => "1", :version => "2", :format => "json" } + { :controller => "api/old_nodes", :action => "show", :id => "1", :version => "2", :format => "json" } ) assert_routing( { :path => "/api/0.6/node/1/2/redact", :method => :post }, diff --git a/test/controllers/api/old_relations_controller_test.rb b/test/controllers/api/old_relations_controller_test.rb index ea26e5cb7..79c1b515b 100644 --- a/test/controllers/api/old_relations_controller_test.rb +++ b/test/controllers/api/old_relations_controller_test.rb @@ -11,7 +11,7 @@ module Api ) assert_routing( { :path => "/api/0.6/relation/1/2", :method => :get }, - { :controller => "api/old_relations", :action => "version", :id => "1", :version => "2" } + { :controller => "api/old_relations", :action => "show", :id => "1", :version => "2" } ) assert_routing( { :path => "/api/0.6/relation/1/history.json", :method => :get }, @@ -19,7 +19,7 @@ module Api ) assert_routing( { :path => "/api/0.6/relation/1/2.json", :method => :get }, - { :controller => "api/old_relations", :action => "version", :id => "1", :version => "2", :format => "json" } + { :controller => "api/old_relations", :action => "show", :id => "1", :version => "2", :format => "json" } ) assert_routing( { :path => "/api/0.6/relation/1/2/redact", :method => :post }, diff --git a/test/controllers/api/old_ways_controller_test.rb b/test/controllers/api/old_ways_controller_test.rb index 4c225fb33..ca2cccd0f 100644 --- a/test/controllers/api/old_ways_controller_test.rb +++ b/test/controllers/api/old_ways_controller_test.rb @@ -11,7 +11,7 @@ module Api ) assert_routing( { :path => "/api/0.6/way/1/2", :method => :get }, - { :controller => "api/old_ways", :action => "version", :id => "1", :version => "2" } + { :controller => "api/old_ways", :action => "show", :id => "1", :version => "2" } ) assert_routing( { :path => "/api/0.6/way/1/history.json", :method => :get }, @@ -19,7 +19,7 @@ module Api ) assert_routing( { :path => "/api/0.6/way/1/2.json", :method => :get }, - { :controller => "api/old_ways", :action => "version", :id => "1", :version => "2", :format => "json" } + { :controller => "api/old_ways", :action => "show", :id => "1", :version => "2", :format => "json" } ) assert_routing( { :path => "/api/0.6/way/1/2/redact", :method => :post }, -- 2.39.5