social_stream-base 0.9.29 → 0.9.30

data/lib/social_stream/base.rb

@@ -25,10 +25,6 @@ module SocialStream
         end
       end
 
-      initializer "social_stream-base.cancan_devise_integration" do
-        ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
-      end
-
       initializer "social_stream-base.toolbar_config" do
         SocialStream::ToolbarConfig.module_eval do
           include SocialStream::ToolbarConfig::Base
@@ -52,6 +48,10 @@ module SocialStream
           config.email_method = :mailboxer_email
         end
       end
+
+      config.to_prepare do
+        ApplicationController.rescue_handlers += [["CanCan::AccessDenied", :rescue_from_access_denied]]
+      end
     end
   end
 end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.29".freeze
+    VERSION = "0.9.30".freeze
   end
 end

data/lib/social_stream/controllers/cancan_devise_integration.rb

@@ -10,8 +10,10 @@ module SocialStream
 
         # Redirect to login if the user is trying to access a protected resource
         # and she is not authenticated
-        def rescue_from_access_denied
-          unless user_signed_in?
+        def rescue_from_access_denied(exception)
+          if user_signed_in?
+            raise exception
+          else
             redirect_to new_user_session_path
           end
         end

data/spec/controllers/users_controller_spec.rb

@@ -41,9 +41,7 @@ describe UsersController do
       begin
         get :edit, :id => Factory(:user).to_param
 
-        assert false
-      rescue CanCan::AccessDenied 
-        assert true
+        response.should redirect_to(:new_user_session)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 9
-  - 29
-  version: 0.9.29
+  - 30
+  version: 0.9.30
 platform: ruby
 authors: 
 - GING - DIT - UPM