Update rubocop class length limit.

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 2f8a477d9e4da06030d2a835b5ccb9318fa2651b..587cfce8292b6e962d3362d2eac8f18b425bbdb8 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -36,7 +36,7 @@ class RelationController < ApplicationController
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id
     new_relation = Relation.from_xml(request.raw_post)
 
     unless new_relation && new_relation.id == relation.id

-      fail OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
+      raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")

     end
 
     relation.update_from new_relation, @user
     end
 
     relation.update_from new_relation, @user


@@ -128,13 +128,13 @@ class RelationController < ApplicationController
 
   def relations
     unless params["relations"]
 
   def relations
     unless params["relations"]

-      fail OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]")
+      raise 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)
 
     end
 
     ids = params["relations"].split(",").collect(&:to_i)
 

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

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