blogelator 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acad8c4010bf554be6cf98e0e36d9ce1cb0dce26
-  data.tar.gz: 6b3bba0bd2d7139a4be61651d04868433c83e16d
+  metadata.gz: 7df71289e4cc6e46f08ae106d85e09c816c42c6b
+  data.tar.gz: 4b681bfd0e777ba2ed89021179cfd20cb636d5a0
 SHA512:
-  metadata.gz: b43de5d0f6652facb9fa2c0fe33a07784f9b961a1bf170f5b8d9811ea17bfdf1c221a990ffac9e3ef35de5249aa55d41e471521061f60a17cacf797433110e39
-  data.tar.gz: 9a5032e3ecdd8247cbce2ccbab196478d0e62b3de81f4722df3380d71d7470ef30cbb7aedead4923845b4352aa5cc7c21a5bac71280e869b8557804488ddfa5e
+  metadata.gz: 6b59799baac3caf6722179a6ef3490954c14ff9c2af1e4ef91ff54644b8c75b326b825d7d66bae748fbc48bc6ad4c3cae1265164e0b8528d3007ba3ec7c24f25
+  data.tar.gz: 945d64199355dbae5c76198985caf4ded75909d452f81e4df1fd9a278de577f2bc7315990534b17b50021eb595170bf653eb616c533fe1066cbcad32b1caefd4

data/app/controllers/concerns/blogelator/admin/auth.rb

@@ -2,22 +2,54 @@ module Blogelator
   module Admin
     module Auth
       extend ActiveSupport::Concern
-      
+
       included do
         check_authorization
         rescue_from CanCan::AccessDenied do |exception|
-          redirect_to main_app.root_url, alert: exception.message
+          unauthorized(exception)
         end
       end
-      
+
       def blogelator_current_user
         respond_to?(:current_user) ? current_user : nil
       end
-      
+
       def current_ability
         @current_ability ||= Blogelator::Ability.new(blogelator_current_user)
       end
-      
+
+      def devise_resource_name
+        Blogelator.user_class.underscore.gsub('/', '_')
+      end
+
+      def login_redirect_path
+        # Try to use Devise's new session path or use the app's root path
+        devise_new_session_path = "new_#{devise_resource_name}_session_path"
+        if main_app.respond_to?(devise_new_session_path)
+          main_app.send(devise_new_session_path)
+        else
+          main_app.root_path
+        end
+      end
+
+      def redirect_back_or_default(default)
+        redirect_to(session["#{devise_resource_name}_return_to"] || default)
+        session["#{devise_resource_name}_return_to"] = nil
+      end
+
+      def store_location
+        session["#{devise_resource_name}_return_to"] = request.fullpath.gsub('//', '/')
+      end
+
+      def unauthorized(exception)
+        if blogelator_current_user
+          redirect_to main_app.root_url, alert: exception.message
+        else
+          store_location
+          redirect_to login_redirect_path, alert: exception.message
+        end
+      end
+
     end
   end
 end

data/lib/blogelator/version.rb

@@ -1,3 +1,3 @@
 module Blogelator
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogelator
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brian Pattison
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk