Use before_validation with :on rather than before_validation_on_xxx

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index ffca1c63c36e922fa53408d191108d1cd20c63cd..c69502a0b3e49b4fcef54b1ed14a255abc72f6f3 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -5,7 +5,7 @@ class ClientApplication < ActiveRecord::Base
   has_many :access_tokens
   validates_presence_of :name, :url, :key, :secret
   validates_uniqueness_of :key
   has_many :access_tokens
   validates_presence_of :name, :url, :key, :secret
   validates_uniqueness_of :key

-  before_validation_on_create :generate_keys
+  before_validation :generate_keys, :on => :create

   
   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 :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

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index f64ec53dbaf4869712d0b2bd1abc1f19a1dd1870..c45a3d569e0bdc8f7f2af78c9c7cef5dd0a3c160 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -3,7 +3,7 @@ class OauthToken < ActiveRecord::Base
   belongs_to :user
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token, :secret
   belongs_to :user
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token, :secret

-  before_validation_on_create :generate_keys
+  before_validation :generate_keys, :on => :create

   
   def self.find_token(token_key)
     token = OauthToken.find_by_token(token_key, :include => :client_application)
   
   def self.find_token(token_key)
     token = OauthToken.find_by_token(token_key, :include => :client_application)