Merge remote-tracking branch 'upstream/pull/4358'

[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 4e46b38d56461c94f50f162169623f1f2ff8a05a..fb808828c80a221d794b205cd256d28f34b7af7c 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -1,44 +1,66 @@
 # The NodeController is the RESTful interface to Node objects
 
 module Api
 # The NodeController is the RESTful interface to Node objects
 
 module Api

-  class NodesController < ApplicationController
+  class NodesController < ApiController

     require "xml/libxml"
 
     require "xml/libxml"
 

-    skip_before_action :verify_authenticity_token
+    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 :authorize, :only => [:create, :update, :delete]

-    before_action :api_deny_access_handler

 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]
 
     authorize_resource
 
     before_action :require_public_data, :only => [:create, :update, :delete]

-    before_action :check_api_writable, :only => [:create, :update, :delete]
-    before_action :check_api_readable, :except => [:create, :update, :delete]

     around_action :api_call_handle_error, :api_call_timeout
 
     around_action :api_call_handle_error, :api_call_timeout
 

-    # Create a node from XML.
-    def create
-      assert_method :put
+    before_action :set_request_formats, :except => [:create, :update, :delete]
+    before_action :check_rate_limit, :only => [:create, :update, :delete]

 
 

-      node = Node.from_xml(request.raw_post, true)
+    # Dump the details on many nodes whose ids are given in the "nodes" parameter.
+    def index
+      raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"]

 
 

-      # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
-      node.create_with_history current_user
-      render :plain => node.id.to_s
+      ids = params["nodes"].split(",").collect(&:to_i)
+
+      raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?
+
+      @nodes = Node.find(ids)
+
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     # Dump the details on a node given in params[:id]
     def show
     end
 
     # Dump the details on a node given in params[:id]
     def show

-      node = Node.find(params[:id])
+      @node = Node.find(params[:id])

 
 

-      response.last_modified = node.timestamp
+      response.last_modified = @node.timestamp

 
 

-      if node.visible
-        render :xml => node.to_xml.to_s
+      if @node.visible
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end

       else
         head :gone
       end
     end
 
       else
         head :gone
       end
     end
 

+    # 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.create_with_history current_user
+      render :plain => node.id.to_s
+    end
+

     # Update a node from given XML
     def update
       node = Node.find(params[:id])
     # Update a node from given XML
     def update
       node = Node.find(params[:id])


@@ -62,22 +84,5 @@ module Api
       node.delete_with_history!(new_node, current_user)
       render :plain => node.version.to_s
     end
       node.delete_with_history!(new_node, current_user)
       render :plain => node.version.to_s
     end

-
-    # Dump the details on many nodes whose ids are given in the "nodes" parameter.
-    def index
-      raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"]
-
-      ids = params["nodes"].split(",").collect(&:to_i)
-
-      raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty?
-
-      doc = OSM::API.new.get_xml_doc
-
-      Node.find(ids).each do |node|
-        doc.root << node.to_xml_node
-      end
-
-      render :xml => doc.to_s
-    end

   end
 end
   end
 end