@@ -24,12 +24,14 @@ module TwitterAuth :utc_offset ] - validates_presence_of :login, :twitter_id - validates_format_of :login, :with => /\A[a-z0-9_]+\z/i - validates_length_of :login, :in => 1..15 - validates_uniqueness_of :login, :case_sensitive => false - validates_uniqueness_of :twitter_id, :message => "ID has already been taken." - validates_uniqueness_of :remember_token, :allow_blank => true + with_options :if => :utilize_default_validations do |v| + v.validates_presence_of :login, :twitter_id + v.validates_format_of :login, :with => /\A[a-z0-9_]+\z/i + v.validates_length_of :login, :in => 1..15 + v.validates_uniqueness_of :login, :case_sensitive => false + v.validates_uniqueness_of :twitter_id, :message => "ID has already been taken." + v.validates_uniqueness_of :remember_token, :allow_blank => true + end def self.table_name; 'users' end @@ -70,6 +72,10 @@ module TwitterAuth include TwitterAuth::BasicUser end + def utilize_default_validations + true + end + def twitter if TwitterAuth.oauth? TwitterAuth::Dispatcher::Oauth.new(self) app/models/twitter_auth/generic_user.rb @@ -60,7 +60,8 @@ module TwitterAuth [ :authorize_path, :request_token_path, :access_token_path, - :scheme ].each do |oauth_option| + :scheme, + :signature_method ].each do |oauth_option| options[oauth_option] = TwitterAuth.config[oauth_option.to_s] if TwitterAuth.config[oauth_option.to_s] end lib/twitter_auth.rb 40cd6896371575e9ce5171fdd4692e169d9cdd53 Michael Bleigh michael@intridea.com http://github.com/mbleigh/twitter-auth/commit/b64af9689ea4a5c0d1695f5ef15131cdcb69fb64 b64af9689ea4a5c0d1695f5ef15131cdcb69fb64 2009-05-29T09:20:14-07:00 2009-05-29T09:20:14-07:00 Allow overriding of default validations of GenericUser. 27abc7b59524fe97acb10602fa69d3e1c885f553 Michael Bleigh michael@intridea.com