# Table name: changeset_comments
#
# id :integer not null, primary key
-# changeset_id :integer not null
-# author_id :integer not null
+# changeset_id :bigint(8) not null
+# author_id :bigint(8) not null
# body :text not null
# created_at :datetime not null
# visible :boolean not null
validates :changeset, :presence => true, :associated => true
validates :author, :presence => true, :associated => true
validates :visible, :inclusion => [true, false]
- validates :body, :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
+ validates :body, :invalid_chars => true
# Return the comment text
def body
#
# Table name: changeset_tags
#
-# changeset_id :integer not null, primary key
+# changeset_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
belongs_to :changeset
validates :changeset, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => :changeset_id }
end
#
# Table name: diary_comments
#
-# id :integer not null, primary key
-# diary_entry_id :integer not null
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# diary_entry_id :bigint(8) not null
+# user_id :bigint(8) not null
# body :text not null
# created_at :datetime not null
# updated_at :datetime not null
scope :visible, -> { where(:visible => true) }
- validates :body, :presence => true
+ validates :body, :presence => true, :invalid_chars => true
validates :diary_entry, :user, :associated => true
after_save :spam_check
#
# Table name: diary_entries
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# title :string not null
# body :text not null
# created_at :datetime not null
scope :visible, -> { where(:visible => true) }
- validates :title, :body, :presence => true
+ validates :title, :body, :presence => true, :invalid_chars => true
validates :title, :length => 1..255
validates :latitude, :allow_nil => true,
:numericality => { :greater_than_or_equal_to => -90,
belongs_to :issue
belongs_to :user
- validates :body, :presence => true
+ validates :body, :presence => true, :invalid_chars => true
validates :user, :presence => true
validates :issue, :presence => true
end
#
# Table name: messages
#
-# id :integer not null, primary key
-# from_user_id :integer not null
+# id :bigint(8) not null, primary key
+# from_user_id :bigint(8) not null
# title :string not null
# body :text not null
# sent_on :datetime not null
# message_read :boolean default(FALSE), not null
-# to_user_id :integer not null
+# to_user_id :bigint(8) not null
# to_user_visible :boolean default(TRUE), not null
# from_user_visible :boolean default(TRUE), not null
# body_format :enum default("markdown"), not null
validates :title, :presence => true, :utf8 => true, :length => 1..255
validates :body, :sent_on, :sender, :recipient, :presence => true
+ validates :title, :body, :invalid_chars => true
def self.from_mail(mail, from, to)
if mail.multipart?
#
# Table name: current_node_tags
#
-# node_id :integer not null, primary key
+# node_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
belongs_to :node
validates :node, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => :node_id }
end
validates :author, :associated => true
validates :event, :inclusion => %w[opened closed reopened commented hidden]
validates :body, :length => { :maximum => 2000 },
- :format => /\A[^\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff]*\z/
+ :invalid_chars => true
# Return the comment text
def body
#
# Table name: node_tags
#
-# node_id :integer not null, primary key
-# version :integer not null, primary key
+# node_id :bigint(8) not null, primary key
+# version :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
belongs_to :old_node, :foreign_key => [:node_id, :version]
validates :old_node, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => [:node_id, :version] }
end
#
# Table name: relation_tags
#
-# relation_id :integer default(0), not null, primary key
+# relation_id :bigint(8) default(0), not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
#
# Foreign Keys
#
belongs_to :old_relation, :foreign_key => [:relation_id, :version]
validates :old_relation, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => [:relation_id, :version] }
end
#
# Table name: way_tags
#
-# way_id :integer default(0), not null, primary key
+# way_id :bigint(8) default(0), not null, primary key
# k :string not null, primary key
# v :string not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
#
# Foreign Keys
#
belongs_to :old_way, :foreign_key => [:way_id, :version]
validates :old_way, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => [:way_id, :version] }
end
# description :text
# created_at :datetime
# updated_at :datetime
-# user_id :integer not null
+# user_id :bigint(8) not null
# description_format :enum default("markdown"), not null
#
# Foreign Keys
has_many :old_ways
has_many :old_relations
+ validates :title, :description, :invalid_chars => true
validates :description, :presence => true
validates :description_format, :inclusion => { :in => %w[text html markdown] }
#
# Table name: current_relation_tags
#
-# relation_id :integer not null, primary key
+# relation_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
belongs_to :relation
validates :relation, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => :relation_id }
end
validates :issue, :presence => true
validates :user, :presence => true
- validates :details, :presence => true
+ validates :details, :presence => true, :invalid_chars => true
validates :category, :presence => true
def self.categories_for(reportable)
#
# Table name: gpx_files
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# visible :boolean default(TRUE), not null
# name :string default(""), not null
-# size :integer
+# size :bigint(8)
# latitude :float
# longitude :float
# timestamp :datetime not null
# description :string default(""), not null
# inserted :boolean not null
# visibility :enum default("public"), not null
+# length :bigint(8)
#
# Indexes
#
validates :user, :presence => true, :associated => true
validates :name, :presence => true, :length => 1..255
+ validates :name, :description, :invalid_chars => true
validates :description, :presence => { :on => :create }, :length => 1..255
validates :timestamp, :presence => true
validates :visibility, :inclusion => %w[private public trackable identifiable]
#
# Table name: gpx_file_tags
#
-# gpx_id :integer default(0), not null
+# gpx_id :bigint(8) default(0), not null
# tag :string not null
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
#
# Indexes
#
belongs_to :trace, :foreign_key => "gpx_id"
validates :trace, :associated => true
- validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}
+ validates :tag, :length => 1..255, :format => %r{\A[^/;.,?]*\z}, :invalid_chars => true
end
:default_url => "/assets/:class/:attachment/:style.png",
:styles => { :large => "100x100>", :small => "50x50>" }
- INVALID_ASCII_CHARS = "/;.,?%#".freeze
- INVALID_NON_ASCII_CHARS = "\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff".freeze
-
validates :display_name, :presence => true, :allow_nil => true, :length => 3..255,
:exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]
validates :display_name, :if => proc { |u| u.display_name_changed? },
:uniqueness => { :case_sensitive => false }
validates :display_name, :if => proc { |u| u.display_name_changed? },
- :format => { :with => /\A[^#{INVALID_NON_ASCII_CHARS}]*\z/ }
- validates :display_name, :if => proc { |u| u.display_name_changed? },
- :format => { :with => /\A[^#{INVALID_ASCII_CHARS}]*\z/,
- :message => I18n.t("users.account.invalid chars", :invalid_chars => INVALID_ASCII_CHARS) }
- validates :display_name, :if => proc { |u| u.display_name_changed? },
- :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") }
- validates :display_name, :if => proc { |u| u.display_name_changed? },
- :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") }
- validates :email, :presence => true, :confirmation => true
+ :invalid_chars => true,
+ :invalid_url_chars => true,
+ :leading_whitespace => true,
+ :trailing_whitespace => true
+ validates :email, :presence => true, :confirmation => true, :invalid_chars => true
validates :email, :if => proc { |u| u.email_changed? },
:uniqueness => { :case_sensitive => false }
validates :pass_crypt, :confirmation => true, :length => 8..255
# Table name: user_blocks
#
# id :integer not null, primary key
-# user_id :integer not null
-# creator_id :integer not null
+# user_id :bigint(8) not null
+# creator_id :bigint(8) not null
# reason :text not null
# ends_at :datetime not null
# needs_view :boolean default(FALSE), not null
-# revoker_id :integer
+# revoker_id :bigint(8)
# created_at :datetime
# updated_at :datetime
# reason_format :enum default("markdown"), not null
class UserBlock < ActiveRecord::Base
validate :moderator_permissions
+ validates :reason, :invalid_chars => true
belongs_to :user, :class_name => "User", :foreign_key => :user_id
belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
#
# Table name: user_preferences
#
-# user_id :integer not null, primary key
+# user_id :bigint(8) not null, primary key
# k :string not null, primary key
# v :string not null
#
belongs_to :user
validates :user, :presence => true, :associated => true
- validates :k, :v, :length => 1..255
+ validates :k, :v, :length => 1..255, :invalid_chars => true
# Turn this Node in to an XML Node without the <osm> wrapper.
def to_xml_node
#
# Table name: current_way_tags
#
-# way_id :integer not null, primary key
+# way_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
belongs_to :way
validates :way, :presence => true, :associated => true
- validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+ validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
validates :k, :uniqueness => { :scope => :way_id }
end
--- /dev/null
+class InvalidCharsValidator < ActiveModel::EachValidator
+ INVALID_CHARS = "\x00-\x08\x0b-\x0c\x0e-\x1f\x7f\ufffe\uffff".freeze
+
+ def validate_each(record, attribute, value)
+ if value =~ /[#{INVALID_CHARS}]/
+ record.errors[attribute] << (options[:message] || "contains invalid chars")
+ end
+ end
+end
\ No newline at end of file
--- /dev/null
+class InvalidUrlCharsValidator < ActiveModel::EachValidator
+ INVALID_URL_CHARS = "/;.,?%#".freeze
+
+ def validate_each(record, attribute, value)
+ if value =~ /[#{INVALID_URL_CHARS}]/
+ record.errors[attribute] << (options[:message] || I18n.t("validations.invalid chars", :invalid_chars => INVALID_URL_CHARS))
+ end
+ end
+end
\ No newline at end of file
--- /dev/null
+class LeadingWhitespaceValidator < ActiveModel::EachValidator
+ def validate_each(record, attribute, value)
+ if value =~ /\A\s/
+ record.errors[attribute] << (options[:message] || I18n.t("validations.leading whitespace"))
+ end
+ end
+end
\ No newline at end of file
--- /dev/null
+class TrailingWhitespaceValidator < ActiveModel::EachValidator
+ def validate_each(record, attribute, value)
+ if value =~ /\s\z/
+ record.errors[attribute] << (options[:message] || I18n.t("validations.trailing whitespace"))
+ end
+ end
+end
\ No newline at end of file
return to profile: Return to profile
flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
flash update success: "User information updated successfully."
- leading whitespace: "has leading whitespace"
- trailing whitespace: "has trailing whitespace"
- invalid chars: "cannot contain invalid chars: %{invalid_chars}"
confirm:
heading: Check your email!
introduction_1: |
not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
flash: "Redaction destroyed."
error: "There was an error destroying this redaction."
+ validations:
+ leading whitespace: "has leading whitespace"
+ trailing whitespace: "has trailing whitespace"
+ invalid chars: "must not contain an invalid char: %{invalid_chars}"
projects / rails.git / commitdiff