Add JSHint support

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

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index 82669f504dca46eda5462cc3fc6c78c7c8704344..ff86407f5011fbcd8862a768391656964ada2935 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -2,25 +2,25 @@
 # into one place. as it turns out, the API methods for historical
 # nodes, ways and relations are basically identical.
 class OldController < ApplicationController
 # into one place. as it turns out, the API methods for historical
 # nodes, ways and relations are basically identical.
 class OldController < ApplicationController

-  require 'xml/libxml'
+  require "xml/libxml"

 
   skip_before_filter :verify_authenticity_token
 
   skip_before_filter :verify_authenticity_token

-  before_filter :setup_user_auth, :only => [ :history, :version ]
-  before_filter :authorize, :only => [ :redact ]
-  before_filter :authorize_moderator, :only => [ :redact ]
-  before_filter :require_allow_write_api, :only => [ :redact ]
+  before_filter :setup_user_auth, :only => [:history, :version]
+  before_filter :authorize, :only => [:redact]
+  before_filter :authorize_moderator, :only => [:redact]
+  before_filter :require_allow_write_api, :only => [:redact]

   before_filter :check_api_readable
   before_filter :check_api_readable

-  before_filter :check_api_writable, :only => [ :redact ]
+  before_filter :check_api_writable, :only => [:redact]

   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout

-  before_filter :lookup_old_element, :except => [ :history ]
-  before_filter :lookup_old_element_versions, :only => [ :history ]
+  before_filter :lookup_old_element, :except => [:history]
+  before_filter :lookup_old_element_versions, :only => [:history]

 
   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.
 
   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.new if @elements.empty?
+    fail OSM::APINotFoundError.new if @elements.empty?

 
     doc = OSM::API.new.get_xml_doc
 
 
     doc = OSM::API.new.get_xml_doc
 


@@ -38,7 +38,7 @@ class OldController < ApplicationController
   end
 
   def version
   end
 
   def version

-    if @old_element.redacted? and not show_redactions?
+    if @old_element.redacted? && !show_redactions?

       render :text => "", :status => :forbidden
 
     else
       render :text => "", :status => :forbidden
 
     else


@@ -52,17 +52,16 @@ class OldController < ApplicationController
   end
 
   def redact
   end
 
   def redact

-    redaction_id = params['redaction']
-    unless redaction_id.nil?
+    redaction_id = params["redaction"]
+    if redaction_id.nil?
+      # if no redaction ID was provided, then this is an unredact
+      # operation.
+      @old_element.redact!(nil)
+    else

       # if a redaction ID was specified, then set this element to
       # be redacted in that redaction.
       redaction = Redaction.find(redaction_id.to_i)
       @old_element.redact!(redaction)
       # if a redaction ID was specified, then set this element to
       # be redacted in that redaction.
       redaction = Redaction.find(redaction_id.to_i)
       @old_element.redact!(redaction)

-
-    else
-      # if no redaction ID was provided, then this is an unredact
-      # operation.
-      @old_element.redact!(nil)

     end
 
     # just return an empty 200 OK for success
     end
 
     # just return an empty 200 OK for success


@@ -72,6 +71,6 @@ class OldController < ApplicationController
   private
 
   def show_redactions?
   private
 
   def show_redactions?

-    @user and @user.moderator? and params[:show_redactions] == "true"
+    @user && @user.moderator? && params[:show_redactions] == "true"

   end
 end
   end
 end