Use Faraday in place of Net::HTTP so we can mock responses

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 132b78e9b54dc2f1fcb670ef0b1f24e52a803223..42b8c7036ee1d81f808572c1760fce1aeff2e4b3 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,14 +1,13 @@
 class RelationController < ApplicationController
 class RelationController < ApplicationController

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

 
 

-  skip_before_filter :verify_authenticity_token
-  before_filter :authorize, :only => [:create, :update, :delete]
-  before_filter :require_allow_write_api, :only => [:create, :update, :delete]
-  before_filter :require_public_data, :only => [:create, :update, :delete]
-  before_filter :check_api_writable, :only => [:create, :update, :delete]
-  before_filter :check_api_readable, :except => [:create, :update, :delete]
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
+  skip_before_action :verify_authenticity_token
+  before_action :authorize, :only => [:create, :update, :delete]
+  before_action :require_allow_write_api, :only => [:create, :update, :delete]
+  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

 
   def create
     assert_method :put
 
   def create
     assert_method :put


@@ -76,9 +75,9 @@ class RelationController < ApplicationController
       # first find the ids of nodes, ways and relations referenced by this
       # relation - note that we exclude this relation just in case.
 
       # first find the ids of nodes, ways and relations referenced by this
       # relation - note that we exclude this relation just in case.
 

-      node_ids = relation.members.select { |m| m[0] == 'Node' }.map { |m| m[1] }
-      way_ids = relation.members.select { |m| m[0] == 'Way' }.map { |m| m[1] }
-      relation_ids = relation.members.select { |m| m[0] == 'Relation' && m[1] != relation.id }.map { |m| m[1] }
+      node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
+      way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
+      relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }

 
       # next load the relations and the ways.
 
 
       # next load the relations and the ways.
 


@@ -133,11 +132,11 @@ class RelationController < ApplicationController
   end
 
   def relations
   end
 
   def relations

-    unless params['relations']
+    unless params["relations"]

       fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
     end
 
       fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
     end
 

-    ids = params['relations'].split(',').collect(&:to_i)
+    ids = params["relations"].split(",").collect(&:to_i)

 
     if ids.length == 0
       fail OSM::APIBadUserInput.new("No relations were given to search for")
 
     if ids.length == 0
       fail OSM::APIBadUserInput.new("No relations were given to search for")