Merge remote-tracking branch 'openstreetmap/pull/1004'

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index a385ae1be1b9aefe6cf2346cb133ec7fad4c069e..0d17d2830a1a5104ae893fabc775d85bb7a5d74d 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -7,26 +7,26 @@ module ConsistencyValidations
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
     if new.id != old.id || new.id.nil? || old.id.nil?
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
     if new.id != old.id || new.id.nil? || old.id.nil?

-      fail OSM::APIPreconditionFailedError.new("New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}.")
+      raise OSM::APIPreconditionFailedError.new("New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}.")

     elsif new.version != old.version
     elsif new.version != old.version

-      fail OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
+      raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)

     elsif new.changeset.nil?
     elsif new.changeset.nil?

-      fail OSM::APIChangesetMissingError.new
+      raise OSM::APIChangesetMissingError.new

     elsif new.changeset.user_id != user.id
     elsif new.changeset.user_id != user.id

-      fail OSM::APIUserChangesetMismatchError.new
+      raise OSM::APIUserChangesetMismatchError.new

     elsif !new.changeset.is_open?
     elsif !new.changeset.is_open?

-      fail OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)

     end
   end
 
   # This is similar to above, just some validations don't apply
   def check_create_consistency(new, user)
     if new.changeset.nil?
     end
   end
 
   # This is similar to above, just some validations don't apply
   def check_create_consistency(new, user)
     if new.changeset.nil?

-      fail OSM::APIChangesetMissingError.new
+      raise OSM::APIChangesetMissingError.new

     elsif new.changeset.user_id != user.id
     elsif new.changeset.user_id != user.id

-      fail OSM::APIUserChangesetMismatchError.new
+      raise OSM::APIUserChangesetMismatchError.new

     elsif !new.changeset.is_open?
     elsif !new.changeset.is_open?

-      fail OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)

     end
   end
 
     end
   end
 


@@ -37,11 +37,11 @@ module ConsistencyValidations
     # check user credentials - only the user who opened a changeset
     # may alter it.
     if changeset.nil?
     # check user credentials - only the user who opened a changeset
     # may alter it.
     if changeset.nil?

-      fail OSM::APIChangesetMissingError.new
+      raise OSM::APIChangesetMissingError.new

     elsif user.id != changeset.user_id
     elsif user.id != changeset.user_id

-      fail OSM::APIUserChangesetMismatchError.new
+      raise OSM::APIUserChangesetMismatchError.new

     elsif !changeset.is_open?
     elsif !changeset.is_open?

-      fail OSM::APIChangesetAlreadyClosedError.new(changeset)
+      raise OSM::APIChangesetAlreadyClosedError.new(changeset)

     end
   end
 end
     end
   end
 end