Show ref of object when no name is present

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 34856f82b2f5a863b185a44f1fe37a4fb404841e..156eeafc7989cc15a6d03d504bef6477aa0604e8 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
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user


@@ -7,11 +7,11 @@ class ClientApplication < ActiveRecord::Base
   has_many :oauth2_verifiers
   has_many :oauth_tokens
 
   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, :allow_blank => true, :format => %r{\Ahttp(s?)://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i
+  validates :callback_url, :allow_blank => true, :format => %r{\A[a-z][a-z0-9.+-]*://(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?}i

 
   before_validation :generate_keys, :on => :create
 
 
   before_validation :generate_keys, :on => :create
 


@@ -52,7 +52,7 @@ class ClientApplication < ActiveRecord::Base
   end
 
   def access_token_for_user(user)
   end
 
   def access_token_for_user(user)

-    unless token = access_tokens.valid.where(:user_id => user).first
+    unless token = access_tokens.valid.find_by(:user_id => user)

       params = { :user => user }
 
       permissions.each do |p|
       params = { :user => user }
 
       permissions.each do |p|


@@ -77,7 +77,7 @@ class ClientApplication < ActiveRecord::Base
   # can agree or not agree to each of them.
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,
                  :allow_write_api, :allow_read_gpx, :allow_write_gpx,
   # can agree or not agree to each of them.
   PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,
                  :allow_write_api, :allow_read_gpx, :allow_write_gpx,

-                 :allow_write_notes]
+                 :allow_write_notes].freeze

 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]
 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]