dangerzone 0.5.1 → 0.5.2

data/lib/dangerzone/templates/controllers/application_controller.rb

@@ -1,8 +1,13 @@
   private
 
   def current_user
+    return @current_user if @current_user
     @current_user = User.find_by_id(session[:user_id]) || User.find_by_remember_token(cookies[:remember_token])
-    request.remote_ip == @current_user.try(:sign_in_ip) ? @current_user : @current_user ||= User.new(sign_in_ip: request.remote_ip)
+    if request.remote_ip == @current_user.try(:sign_in_ip)
+      @current_user
+    else
+      @current_user = User.new(sign_in_ip: request.remote_ip)
+    end
   end
 
   def authorize_user

metadata

@@ -2,14 +2,14 @@
 name: dangerzone
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Michael Crismali
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby