Convert lib files to model concerns

lib/consistency_validations.rb

@@ -1,47 +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.id != old.id || new.id.nil? || old.id.nil?
-      raise OSM::APIPreconditionFailedError, "New and old IDs don't match on #{new.class}. #{new.id} != #{old.id}."
-    elsif 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
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError
-    elsif !new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, 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
-    elsif new.changeset.user_id != user.id
-      raise OSM::APIUserChangesetMismatchError
-    elsif !new.changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, 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
-    elsif user.id != changeset.user_id
-      raise OSM::APIUserChangesetMismatchError
-    elsif !changeset.is_open?
-      raise OSM::APIChangesetAlreadyClosedError, changeset
-    end
-  end
-end

lib/redactable.rb

@@ -1,22 +0,0 @@
-require "osm"
-
-module Redactable
-  def self.included(base)
-    # this is used to extend activerecord bases, as these aren't
-    # in scope for the module itself.
-    base.scope :unredacted, -> { where(:redaction_id => nil) }
-  end
-
-  def redacted?
-    !redaction.nil?
-  end
-
-  def redact!(redaction)
-    # check that this version isn't the current version
-    raise OSM::APICannotRedactError if is_latest_version?
-
-    # make the change
-    self.redaction = redaction
-    save!
-  end
-end