action_interceptor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5219caf7c3ae392a580e0a606da9ac737d2e5173
-  data.tar.gz: 5230304186f4371bdcff05095608eaa64477b286
+  metadata.gz: 31e855e9e9869ca8e5d409a7016be38bd81f560a
+  data.tar.gz: 5ee08d985554e577b922afd1b5d53db794782794
 SHA512:
-  metadata.gz: 55685689e660070c230e0e4026ff4d8221f4199f7793cf60b5501ec59dc112b765834a23c005ca8269f38f5408f94540b1483b3777be626ce3c6f62203483728
-  data.tar.gz: 5fa8ada75dc889139dfd9a065423dcb3c58614a78c3a9a53aac17ec5c9a03a0abccff0ff45a9a82cc38476f201b9b62ba1962b468cb0ca26693d10b3c2537289
+  metadata.gz: 08c253742ec490768f8cac0f082f2692a8b025153a2768c8a2832c64874be5755c1a45ad0542ebc6f7cf226278665131e487d2c714ca3d5043e47bc442c099f2
+  data.tar.gz: fe5c9c8635292d2db08b17837f82743d6d14eb645707c702fb26119daf1424a22afaa2e10377f1350f07ac416922ae04465aaf8e82206dd7195a8035708b6029

data/lib/action_interceptor/controller.rb

@@ -28,7 +28,8 @@ module ActionInterceptor
       key = ActionInterceptor.intercepted_url_key
 
       # Can't redirect back to non-get
-      url = Encryptor.encrypt_and_sign(request.get? ? current_url : root_url)
+      # Also, can't call root_url here, so use '/' instead
+      url = Encryptor.encrypt_and_sign(request.get? ? current_url : '/')
       @current_url_hash = {key => url}
     end
 
@@ -104,11 +105,17 @@ module ActionInterceptor
 
           def without_interceptor_url_options(&block)
             url_options_with_interceptor = url_options
-            @interceptor_url_options = url_options_without_interceptor
-            yield block
-            @interceptor_url_options = url_options_with_interceptor
+
+            begin
+              @interceptor_url_options = url_options_without_interceptor
+              yield block
+            ensure
+              @interceptor_url_options = url_options_with_interceptor
+            end
           end
 
+          alias_method :without_interceptor, :without_interceptor_url_options
+
           def intercepted_url
             return @intercepted_url if @intercepted_url
 
@@ -133,11 +140,14 @@ module ActionInterceptor
           def redirect_back(options = {})
             url = intercepted_url
 
-            # Convert '/' back to root_url
-            # Also, prevent self redirects
-            url = root_url if url == '/' || current_page?(url)
+            # Disable the return_to param
+            without_interceptor_url_options do
+              # Convert '/' back to root_url
+              # Also, prevent self redirects
+              url = root_url if url == '/' || current_page?(url)
 
-            redirect_to url, options
+              redirect_to url, options
+            end
           end
 
         end

data/lib/action_interceptor/version.rb

@@ -1,4 +1,4 @@
 module ActionInterceptor
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails