Drop iconv which is deprecated and only needed for ruby 1.8 support

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
index 4f3881542e39afcadf490c089669a2369f692b57..a385ae1be1b9aefe6cf2346cb133ec7fad4c069e 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/lib/consistency_validations.rb
@@ -1,30 +1,32 @@
 module ConsistencyValidations
   # Generic checks that are run for the updates and deletes of
-  # node, ways and relations. This code is here to avoid duplication, 
+  # node, ways and relations. This code is here to avoid duplication,
   # and allow the extention of the checks without having to modify the
-  # code in 6 places for all the updates and deletes. Some of these tests are 
-  # needed for creates, but are currently not run :-( 
+  # code in 6 places for all the updates and deletes. Some of these tests are
+  # needed for creates, but are currently not run :-(
   # This will throw an exception if there is an inconsistency
   def check_consistency(old, new, user)
-    if new.version != old.version
-      raise OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
+    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}.")
+    elsif new.version != old.version
+      fail OSM::APIVersionMismatchError.new(new.id, new.class.to_s, new.version, old.version)
     elsif new.changeset.nil?
-      raise OSM::APIChangesetMissingError.new
+      fail OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      fail OSM::APIUserChangesetMismatchError.new
+    elsif !new.changeset.is_open?
+      fail 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?
-      raise OSM::APIChangesetMissingError.new
+      fail OSM::APIChangesetMissingError.new
     elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
+      fail OSM::APIUserChangesetMismatchError.new
+    elsif !new.changeset.is_open?
+      fail OSM::APIChangesetAlreadyClosedError.new(new.changeset)
     end
   end
 
@@ -35,11 +37,11 @@ module ConsistencyValidations
     # check user credentials - only the user who opened a changeset
     # may alter it.
     if changeset.nil?
-      raise OSM::APIChangesetMissingError.new
-    elsif user.id != changeset.user_id 
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(changeset)
+      fail OSM::APIChangesetMissingError.new
+    elsif user.id != changeset.user_id
+      fail OSM::APIUserChangesetMismatchError.new
+    elsif !changeset.is_open?
+      fail OSM::APIChangesetAlreadyClosedError.new(changeset)
     end
   end
 end