Apply suggestions of @brauliobo. Change the scope of UserNotActive exception to User model namespace

Michel Felipe
1 parent f0214e00
Showing 2 changed files with 14 additions and 16 deletions Show diff stats
app/controllers/public/account_controller.rb
app/models/user.rb
@@ -48,7 +48,7 @@ class AccountController &lt; ApplicationController
  
     begin
       self.current_user ||= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
-    rescue NoosferoExceptions::UserNotActivated => e
+    rescue User::UserNotActivated => e
       session[:notice] = e.message
       return
     end
@@ -242,11 +242,21 @@ class User &lt; ActiveRecord::Base
     password.crypt(salt)
   end
  
+  class UserNotActivated < StandardError
+    attr_reader :user
+
+    def initialize(message, user = nil)
+      @user = user
+
+      super(message)
+    end
+  end
+
   def authenticated?(password)
  
     unless self.activated?
       message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
-      raise NoosferoExceptions::UserNotActivated.new(message, self)
+      raise UserNotActivated.new(message, self)
     end
  
     result = (crypted_password == encrypt(password))
@@ -293,9 +303,9 @@ class User &lt; ActiveRecord::Base
         self.errors.add(:current_password, _('does not match.'))
         raise IncorrectPassword
       end
-    rescue NoosferoExceptions::UserNotActivated => e
+    rescue UserNotActivated => e
       self.errors.add(:current_password, e.message)
-      raise IncorrectPassword
+      raise UserNotActivated
     end
     self.force_change_password!(new, confirmation)
   end
@@ -411,15 +421,3 @@ class User &lt; ActiveRecord::Base
       Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => (NOOSFERO_CONF['hours_until_user_activation_check'] || 72).hours.from_now})
     end
 end
-
-module NoosferoExceptions
-  class UserNotActivated < ActiveRecord::ActiveRecordError
-    attr_reader :user
-
-    def initialize(message, user = nil)
-      @user = user
-
-      super(message)
-    end
-  end
-end
...	...	@@ -48,7 +48,7 @@ class AccountController < ApplicationController
48	48
49	49	begin
50	50	self.current_user \|\|= User.authenticate(params[:user][:login], params[:user][:password], environment) if params[:user]
51		- rescue NoosferoExceptions::UserNotActivated => e
	51	+ rescue User::UserNotActivated => e
52	52	session[:notice] = e.message
53	53	return
54	54	end
...	...
...	...	@@ -242,11 +242,21 @@ class User < ActiveRecord::Base
242	242	password.crypt(salt)
243	243	end
244	244
	245	+ class UserNotActivated < StandardError
	246	+ attr_reader :user
	247	+
	248	+ def initialize(message, user = nil)
	249	+ @user = user
	250	+
	251	+ super(message)
	252	+ end
	253	+ end
	254	+
245	255	def authenticated?(password)
246	256
247	257	unless self.activated?
248	258	message = _('The user "%{login}" is not activated! Please check your email to activate your user') % {login: self.login}
249		- raise NoosferoExceptions::UserNotActivated.new(message, self)
	259	+ raise UserNotActivated.new(message, self)
250	260	end
251	261
252	262	result = (crypted_password == encrypt(password))
...	...	@@ -293,9 +303,9 @@ class User < ActiveRecord::Base
293	303	self.errors.add(:current_password, _('does not match.'))
294	304	raise IncorrectPassword
295	305	end
296		- rescue NoosferoExceptions::UserNotActivated => e
	306	+ rescue UserNotActivated => e
297	307	self.errors.add(:current_password, e.message)
298		- raise IncorrectPassword
	308	+ raise UserNotActivated
299	309	end
300	310	self.force_change_password!(new, confirmation)
301	311	end
...	...	@@ -411,15 +421,3 @@ class User < ActiveRecord::Base
411	421	Delayed::Job.enqueue(UserActivationJob.new(self.id), {:priority => 0, :run_at => (NOOSFERO_CONF['hours_until_user_activation_check'] \|\| 72).hours.from_now})
412	422	end
413	423	end
414		-
415		-module NoosferoExceptions
416		- class UserNotActivated < ActiveRecord::ActiveRecordError
417		- attr_reader :user
418		-
419		- def initialize(message, user = nil)
420		- @user = user
421		-
422		- super(message)
423		- end
424		- end
425		-end
...	...