Standardise on avoiding except lists for check_api_readable

Although this is technically duplicative, it's much easier to read
and therefore to maintain, particularly if you put the _readable one
first.

diff --git a/app/controllers/api/changeset_comments_controller.rb b/app/controllers/api/changeset_comments_controller.rb
index e8d3f4c3a8df2c5dbcc1ae77f864d77057846449..c1980e80b38159dfe3e96b3cd769491b952544c4 100644 (file)
--- a/app/controllers/api/changeset_comments_controller.rb
+++ b/app/controllers/api/changeset_comments_controller.rb
@@ -1,7 +1,7 @@
 module Api
   class ChangesetCommentsController < ApiController
+    before_action :check_api_readable
     before_action :check_api_writable
-    before_action :check_api_readable, :except => [:create]
     before_action :authorize
 
     authorize_resource

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 2e21f0c75e10387bbec4126c03c073ffd2fd20c9..71ffc6d137baa7994e46c5f875e97cf17b216b06 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -2,8 +2,8 @@
 
 module Api
   class ChangesetsController < ApiController
+    before_action :check_api_readable
     before_action :check_api_writable, :only => [:create, :update, :upload, :subscribe, :unsubscribe]
-    before_action :check_api_readable, :except => [:index, :create, :update, :upload, :download, :subscribe, :unsubscribe]
     before_action :setup_user_auth, :only => [:show]
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
 

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index dc7d04dc5792d93698aa7ddc8b899a0592485c86..1ccc2152d63c54c28f9a1980d6f0a78d49186e0d 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -2,8 +2,8 @@
 
 module Api
   class NodesController < ApiController
+    before_action :check_api_readable
     before_action :check_api_writable, :only => [:create, :update, :delete]
-    before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index e82ac6368a371fb43bb2bfaa6e7db071f3f0ddef..6cd3f4137d5eec6af0ab639ffae117ec8334f175 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -1,7 +1,7 @@
 module Api
   class RelationsController < ApiController
+    before_action :check_api_readable
     before_action :check_api_writable, :only => [:create, :update, :delete]
-    before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index d9b5bce258409b70501fd1033d4288d49ef8c688..a510655ca38a340b669c2944b42333669547a787 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,6 +1,6 @@
 module Api
   class TracesController < ApiController
-    before_action :check_api_readable, :only => [:show, :data]
+    before_action :check_api_readable
     before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :set_locale
     before_action :authorize

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index f8254d8027bacbd43fe8e0c6c641c78b8b04e338..7878c8701dd5d49783bb5c93fe0e1d6b694f1639 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -1,7 +1,7 @@
 module Api
   class WaysController < ApiController
+    before_action :check_api_readable
     before_action :check_api_writable, :only => [:create, :update, :delete]
-    before_action :check_api_readable, :except => [:create, :update, :delete]
     before_action :authorize, :only => [:create, :update, :delete]
 
     authorize_resource