Allow space as a language separator

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 34856f82b2f5a863b185a44f1fe37a4fb404841e..e37629d1798fcbf2818be825a94d8075ed1683fb 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -1,4 +1,4 @@
-require 'oauth'
+require "oauth"
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
@@ -7,11 +7,10 @@ class ClientApplication < ActiveRecord::Base
   has_many :oauth2_verifiers
   has_many :oauth_tokens
 
-  validates_presence_of :name, :url, :key, :secret
-  validates_uniqueness_of :key
-  validates_format_of :url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i
-  validates_format_of :support_url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank => true
-  validates_format_of :callback_url, :with => /\A[a-z][a-z0-9.+-]*:\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank => true
+  validates :key, :presence => true, :uniqueness => true
+  validates :name, :url, :secret, :presence => true
+  validates :url, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
+  validates :support_url, :callback_url, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
 
   before_validation :generate_keys, :on => :create