Rename api element version action to show

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

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index fa2b5814e49a400a5b22fd95d5d287812bb4fb29..7c9c32e639a12602ee6678bcf800fdbbf5f1cb1c 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -5,49 +5,51 @@ module Api
   class OldController < ApiController
     require "xml/libxml"
 
-    before_action :setup_user_auth, :only => [:history, :version]
+    before_action :check_api_readable
+    before_action :check_api_writable, :only => [:redact]
+    before_action :setup_user_auth, :only => [:history, :show]
     before_action :authorize, :only => [:redact]
 
     authorize_resource
 
-    before_action :check_api_readable
-    before_action :check_api_writable, :only => [:redact]
     around_action :api_call_handle_error, :api_call_timeout
     before_action :lookup_old_element, :except => [:history]
     before_action :lookup_old_element_versions, :only => [:history]
 
+    before_action :set_request_formats, :except => [:redact]
+
     def history
       # the .where() method used in the lookup_old_element_versions
       # call won't throw an error if no records are found, so we have
       # to do that ourselves.
       raise OSM::APINotFoundError if @elements.empty?
 
-      doc = OSM::API.new.get_xml_doc
-
-      visible_elements = if show_redactions?
-                           @elements
-                         else
-                           @elements.unredacted
-                         end
-
-      visible_elements.each do |element|
-        doc.root << element.to_xml_node
+      # determine visible elements
+      @elems = if show_redactions?
+                 @elements
+               else
+                 @elements.unredacted
+               end
+
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json
       end
-
-      render :xml => doc.to_s
     end
 
-    def version
+    def show
       if @old_element.redacted? && !show_redactions?
         head :forbidden
 
       else
         response.last_modified = @old_element.timestamp
 
-        doc = OSM::API.new.get_xml_doc
-        doc.root << @old_element.to_xml_node
-
-        render :xml => doc.to_s
+        # Render the result
+        respond_to do |format|
+          format.xml
+          format.json
+        end
       end
     end