Remove spaces before colons in en.yml

[rails.git] / app / controllers / api / nodes_controller.rb

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 6934a13c04b9d6e8373a0b68bfde994a9f71177d..b7165b2fe69039342a3594f6bd4c5126075a8101 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -2,18 +2,14 @@
 
 module Api
   class NodesController < ApiController
 
 module Api
   class NodesController < ApiController

-    require "xml/libxml"
-
-    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]
+    before_action :check_api_writable, :only => [:create, :update, :destroy]
+    before_action :authorize, :only => [:create, :update, :destroy]

 
     authorize_resource
 
 
     authorize_resource
 

-    before_action :require_public_data, :only => [:create, :update, :delete]
-    around_action :api_call_handle_error, :api_call_timeout
-
-    before_action :set_request_formats, :except => [:create, :update, :delete]
+    before_action :require_public_data, :only => [:create, :update, :destroy]
+    before_action :set_request_formats, :except => [:create, :update, :destroy]
+    before_action :check_rate_limit, :only => [:create, :update, :destroy]

 
     # Dump the details on many nodes whose ids are given in the "nodes" parameter.
     def index
 
     # Dump the details on many nodes whose ids are given in the "nodes" parameter.
     def index


@@ -51,8 +47,6 @@ module Api
 
     # Create a node from XML.
     def create
 
     # Create a node from XML.
     def create

-      assert_method :put
-

       node = Node.from_xml(request.raw_post, :create => true)
 
       # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
       node = Node.from_xml(request.raw_post, :create => true)
 
       # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml


@@ -74,7 +68,7 @@ module Api
     # Delete a node. Doesn't actually delete it, but retains its history
     # in a wiki-like way. We therefore treat it like an update, so the delete
     # method returns the new version number.
     # Delete a node. Doesn't actually delete it, but retains its history
     # in a wiki-like way. We therefore treat it like an update, so the delete
     # method returns the new version number.

-    def delete
+    def destroy

       node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)
 
       node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)