From 38758821725b85e49efbaa8d44735c81c92cf775 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 26 Jun 2013 22:42:02 +0100 Subject: [PATCH] Remove multiline regular expression anchors from validations --- app/models/tracetag.rb | 2 +- app/models/user.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb index 1b8ba2309..58d1d782f 100644 --- a/app/models/tracetag.rb +++ b/app/models/tracetag.rb @@ -1,7 +1,7 @@ class Tracetag < ActiveRecord::Base self.table_name = "gpx_file_tags" - validates_format_of :tag, :with => /^[^\/;.,?]*$/ + validates_format_of :tag, :with => /\A[^\/;.,?]*\z/ validates_length_of :tag, :within => 1..255 attr_accessible :tag diff --git a/app/models/user.rb b/app/models/user.rb index b8ec9aebc..f5c435309 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -38,9 +38,9 @@ class User < ActiveRecord::Base validates_length_of :display_name, :within => 3..255, :allow_nil => true validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? } validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? } - validates_format_of :display_name, :with => /^[^\/;.,?%#]*$/, :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\A[^\/;.,?%#]*\z/, :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\A\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\S\z/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true -- 2.39.5