Merge remote-tracking branch 'upstream/pull/2641'

[rails.git] / lib / consistency_validations.rb

diff --git a/lib/consistency_validations.rb b/lib/consistency_validations.rb
deleted file mode 100644 (file)
index 4f38815..0000000
--- a/lib/consistency_validations.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module ConsistencyValidations
-  # Generic checks that are run for the updates and deletes of
-  # 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 :-( 
-  # 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)
-    elsif new.changeset.nil?
-      raise 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)
-    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
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError.new
-    elsif not new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError.new(new.changeset)
-    end
-  end
-
-  ##
-  # subset of consistency checks which should be applied to almost
-  # all the changeset controller's writable methods.
-  def check_changeset_consistency(changeset, user)
-    # 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)
-    end
-  end
-end